Did some optimizing and small tweaks

Runs faster/smoother now 