Cleanup

Cleaned up a lot of code
Set up backend for settings and improved skills