erorcun Fixes and style changes from miami