Corrected a bug and merged improvements from managem