Tuneup

fixes #19