forgot to commit
fixed some more things