Improved log messages
Prevents that future changes from the user affect the internal functionality
Made non-serializable fields in a serializable class serializable
Cosmetic code improvements