cleaning up + fixes