Misc improvements. Bug fix in arrows - now the correct angles function is used.