some fixes in source