Fixed some Errors

MAKE SURE WHAT YOU PUSH TO MASTER DOESN'T BREAK IT