lots of misc changes
fix issue, !important