fixed a bug
fixed some more bugs