some cleanup and more options