fixed preseed, touched up code