Finished Initial Fixes 0.01