fixed some errors everywhere