bunch of minor fixed. i need a break