2 more mechanics added, fixes.