More tweaks, reworked template, added more info