add ga + some bugfixes