first beta

fixed a couple of bugs