Added mask parameter to ORB + some TODO comments