various changes
resolved conflicts