Allow custom words
Removed issue that was borking tests
Added length check