Remove fixme.

It is not easily possible to remove the referenced magic numbers. Doing so would
involve having a class attributes call methods on the came class... which gets
messy.
Re-add comments

Comments are in place for the sake of consistency
Update docstring
Merge branch 'master' into ui-improvements