added max height and minor changes from psas suggestions