Small fixes should give major impact :D