Final cleanup, update readme