More fixes. It's looks good now!