Fixed some more minor errors and removed alerts