fixed more bugs

it should look awesome now