Made some changes and added omnicomplete