Many changes, now 5 different layouts

Added parameter files, some bugfixes, and some comments