Bug-fixes, App buildable and mostly working