Little improvements everywhere(;