Removed transitions; minor fixes