More fixes/features