adjusted a few parts after 1st review