Corrected a syntax error in general.php and added some additional improvements

More...