Resolving a few bugs
Working on bugs
Merge remote-tracking branch 'origin/bum' into bum