Clean-up + fixes