Fixed, removed fixmes. Added new files for control via CalBay example