My Fixes

template var is there for late use... :)