Bug Fixes
Some pictures