Fix small bugs, ready for beta