clean-up + fixes