fixes #38 and style updates