cleanup and add a few more things