Promises removed + bugs fixed