changed selectors, added few notes, not all hacks removed yet