Reformatted xml a little bit to fit current displays
Added some PHPDoc comments and some small improvements