Fixed merge issues + minor changes