Some fixes, getting it functional