Updated readme, small fixes in codebase