Corrected growth fixes #3, fixes #4

Still need to do cleanup.