closes #1631 (closed) #1630 (closed) #1629 (closed) #1632 (closed) #1635 (closed) #1634 (closed) #1633 (closed) #1636 (closed)