added splash and cleaned up