Some fix and improved

http://photozou.jp/photo/show/280550/167456799