Fixed bug and renamed selectors to be more descriptive...