Fixed a bug with %C not being recognized. Removed uneccessary switch()
More bug fixes.