Fixed some things

This is not ready yet but my time is up. Can help more next week.