some final bug fixing for today....