fix and cleanup on linux
a little spirit