#131
bug fixes