various changes
changes due to merge