alpha 2
add small improvements