Fixes and touch ups