Testing branching and some bug fixes