Fixed bugs, feeling awesome!