fix bugs and implement minor changes