better templating; removed/refactored some shit

will unspecify at a later date