add marchat
minor bug fixes