added wcs support and some minor updates