some nagging bugs fixed