ready for pull
fixed some merge issues