code improvements, new functions and new settings