Keys moved to window.h and a bit more readme action