some simplifications and btw switch to play-2.1.3