Fixed the issues

Thanks again Mira it should be working correctly now :D