Found more elegant non-entity click detection. Cleaned up classes and fixed some bugs