7th push

close to final version, some minor formatting issues remain