Many fixes / working code