fixed #117, fixed #114 + some model annotation