Fixing things

Check back later..