fixed some issues and such