fix first set of bugs