Various bug fixes, changed readme format