Some cleaning up and a few little bugs are solved!