Improved fe mechanics some