Fixed dem bugs I think