Some initial cleanups/rework/improvements

This are just some initial cleanups I have done,
next step is to show what is going on while working and show errors while they occur