fixed minor bug
fixed few stuff
temp