improvements, fixes