Added overrides. Minor changes to anteckningar. Started to change the drawing procedures.