General bug fixing and update of to-do