Cleaning up + fixes