New flags for optimization and variables for tracking

Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>