fixed up more styling errors. Need to work on testcases and UI soon.