got more bartest done, fixed couple of bugs
more bartest, some fixes