MOD ready for git
MOD some bug fixes