minor fixes... :P e more testing!