Increased efficiency, resolved #1, #2