Moar fixes and rewritten abstract