- Hopefully finally fixed attachment aligning code.
- Clean up of attachment code.