fixed some errors/bugs introduced by merging error
fixed some errors/bugs introduced by merging error

Some bugs/errors were introduced to the code from my last commit,
due to some merging mistakes made when I had to merged my code with
Nathaniel's. The errors were missing model in $uses and some
accidentally deleted code.

eecian/Team08-iPeer,eecian/Team08-iPeer,eecian/Team08-iPeer,eecian/Team08-iPeer