Fixing bugs, adapting to Linux