M: Cleanup

Getting back into the code, cleaning up.
M: .gitignore prepared for UI