fixed some bugs 16th feb feedback