Cleaned up more; fixed unnecessary parameters in caption functions