fix small bugs
all major features finished