general cleanup and overall improvements