Fixed some stuff, got rid of old scheme