Fixed some minor inconsistencies
Added the helper files to commit, oops