Set readme and small bug fixes