some fixes; always making it look better