buncha basic fixes