Fixed a lot of bugs and added some Methods