small fixes, need to think about better ways to fix this