Fixed minor syntax errors and added package headers