Fixes, updates, more fixes and mainly build code from zero