Simple Bugfix and Adding Templates for Alex