Update define functions
Update define functions
Update define functions
Remove args p and plot
Delete redundant file
Miscellaneous updates and typo fixes