clean up still.. a few missing pieces