bug fix and stuff
bug fix and stuff