Updated to 1.5.2 and fixed errors plus making it more easy to code further