Corrected small model mistakes, prepared #15 and fixed #28

Signed-off-by: marcanpilami <marsu_pilami@msn.com>