Fixed all errors and such