Fixed dash and some bugs