bug fixes, aget tested