fixes various bugs, now in beta status