master: methods for decorators are now optional, removing some whitespace that doesn't work anyway from templates
master: fix to decorator interation