added X window check and moved scala to v.24 check