Small fixes

Added number highlight, fixed merging