some changes to scaling
updated to implicit euler integration
merged