X-Ray module added + bug fixes