Gab

Fixes for stuff