cleanup and new stuff!