Changed leader to space + various improvements