preemware

Results 2 issues of preemware

For review.

needs follow up