fixed some bugs and worked on pc-version -- needs some testing but looks like it's working now