Quick Fix

Sorry for the minor updates, I didn't double check the newly added features and it caused a lot of errors, very sorry for these updates.