Clean, type fixes, type extensions

We cleaned up the whole code. Furthermore, we fixed and extended many
types in the expression commands and constants.