fix source specifications for ELPA + minor style fixes