Comments... Some small code reworking, added year 2013 to copyright stuff