A couple of TODOs removed (hardcoded values instead of constants)
Fixes #1103