minor bug fixing and plishing
merging