finalizing some issues
First version completed