fixed subjects & decade template, and more