mainly just fixing bugs and stuff