readme and template config updated. + some bug fixes