code cleanup and fixes
More kippt-like spinner
Updated version
Merged @hernan's PR with few fixes