Fixed a lot of things

Should be ready for today's meeting