Fixed alot of small bugs after using the framework