Updated branch with various things