added more testing code;
small tweaks,