Fixes #2; Cleans up #26 & #24;