fixing push/pop to save nostroke and nofill closes #294