update with some fixes, thanks!