Slight Fixes

Not so bad now, still needs work.