Completions added/updated.
Removed unnecessary comments.
Fixed an unintended result of some copy paste.
Functions instead of static variables for conditions.