Making it work

Various updates to make it work for me, as well as some comment removal