adding new preset + lots of changes and fixes