Changed option formatting to improve functionality and started work on so of the functions