Small fixes and better strategic positioning