All apparent bugs attended to (for real hehe)