alpha 3
Some fixes