cleaned up params. need to rewrite read-in and initializations