updated parameters, no ints, add preparations
added default state properties
cont cleaning files, big-lantern in progress