Clean up of readme and bug fixes.