Corrected selectors. Fixed bugs.