applied minor fixes suggested by @maker