Fix prevsplit positioning, various cleanup