Cleanups fixes and better integration to GsKit