Minor Tweaks

Still need to fix that right click bug.