fixes and issue 7