Further generalized IPL content
Added tests
Misc. corrections