chore: more organized with error messages
chore: some modifications