Correcting other bugs
Stuff working (finally)