Add consts where appropriate

Signed-off-by: Shahbaz Youssefi <ShabbyX@gmail.com>
[update] [map] pad key to align data

Signed-off-by: Shahbaz Youssefi <ShabbyX@gmail.com>
Merge remote-tracking branch 'origin/master'

Signed-off-by: Shahbaz Youssefi <ShabbyX@gmail.com>