other general bugs fixed.