Fixed minor issues such as it not working at all
Formatting