updated README
cleanup README
fix merge issues