More fixes/things

misc stuffs