Fix library, spice up Window