Speedc now part of beam model

Minor moves here and there