added angle constant
fixed some variable issues