made more relocation fixes and added figability