few fixes, it's almost complete!! :D