Fixed Stashing Error, Minnor Bugfixes