Minor Changes + Fixes