fixed layout.
added conv methods.
changed safeMode to mode - different param