improved debugging
moved stuff around
added stargates