Merge pull request #4 from Xerkus/feature/tweaks

Feature/tweaks
some more styling mess