added movement stopper + some cleanup
commas for clarity
fixed all bugs
FIXED ALL BUGS