Cleaned up completion list; Added missing completions/keywords