Update #7.2

Fixed alot of bugs.