bug fix and some new stuff coming