Committing updates

Bug Fix: No more error when first starting up.