fixing the mess. Hope future comit messages get better lol
more improvements. Going for the first tag