Use stdlib2, cleaned up a bit