cleanup + added preferences
flight test