Faster attachments, fixes for manual bugs