Development

minor fixes