close #57 for temp with workaround
minor adjustments