Performance tweaks
More tweaking, not sure how much extra speed I've really achieved...