More changes due to Sonic suggestions...