fixed a lot of breaking changes due to alpha 14