Some fixes and preparing to add /weather command