fixed bugs, stuff works now