More preset stuff - additions and bug fixes continue...