some fixes and say goodby to ELPA