updates / fixes

resolve conflicts