bugs fixed + transition done