Cleanup and some additonal stuff