cleans up documentation and description text
marks this as an executable
cleans up the code a bit
fixes merge