Added POD, code tweaks