A lot of fixes and changes

Don't even recall waht I did! I need food for mah brain.