I fixed some issues i had with this…enjoy