Improvements

SnowPhoenix helped work stuff out.