fixed some small issues, gotta return to the formatting