Adding +/- formatting and misc tweaks