cleaning up issues in regaurds to merging