Cleaned up some bits, added find by name