some updates

shorten code, updated docblocks