fixing bugs and shiet