filled gaps, made some tweaks