PR for fixing and adding new things

New things! Fixes! Yay!