New functions :D, minor fixes :3