working on the format, fixed a few bugs as well...