Bugs fixed still testing