fixing mavericks bugs and updating with new protocol support