Cleanup and small Fixes