source and few updates