Bug fixes, qtip changes (Ryan)