-finished fixing bugs and all. Everything should work