fixed some more bugs in local