made a few more changes
resolved issues