Fixed a weird return error....... I think
Made some variables final