Sanity Changes

Close #18