Definition changes

as discussed on the mailinglist here are the additional notes and some change on the make file.