small set of bug fixing