Minor bugs, added h5 and h6, others