Working
Fixes and readme