Fixed errors and things