fix various bugs
readme
pull and resolve conflicts