general improvements and hopefully fixed issu
#55