bugs fixed, all ok now