minor code edits
merging small stuff