fixed bug and added basic selectors