Some small changes; moved most formatting stuff to the sty files