new fixed bugs portion - final I hope)))
Merge branch 'master' of https://github.com/KernelCorp/almadeladanza