cleaning bugs
fixing code
add development state conf