Needs a bit of a cleanup, see pics for cosmetic issues.