General touch ups in Shuttle code. calculate constants the right way...