Bug fixed + updates