Company API  + General Fixes