#1 a fine first commit
#1 a few small fixes
MERGING #1 INTO testrossome MADE BY git311