all these months past, finally fixing some bugs