starting fixing bugs. Everything should work soon