Loopj update and bug fixes