good bug fixing

and addition of transitions