last few bug fixes on current functionality