#116 Fixed some minor issues