fixed a few bugs that occurred on the live server