fixing errors with last few commits