Add fe functionality, make things look slightly better.