Cap fixes, other misc stuff, just general nitpicking