Minor fixes and my selection indicator