Unfinished fixes made

Fix these ASAP