some bugs are fixed
Merge branch 'master' of https://github.com/KernelCorp/almadeladanza
some bugs from the list are fixed