fixed more issues with parsing wnsks