started bug fixing