Did some more testing and minor tweaks