a few more bug fixing..