Cleaned up some objects, other small fixes