Fancified output and fixed a few bugs