Fix int -> double
Fix dumb mistakes and test model components