Version 0.2 + template cleanup