some fixes, additions, added thanks :D