Some error fixes, there is a lot to be done here.
Stay tuned.