more fixes more features, yay...