Improved: Better log comments
Improved: More keywords