Item template parsing, other random changes