Fixed bugs, fully functional