Some more slight edit in functionality and more checks