Template component code improved.
Various comments fixed.
 Small readme fix