more arm work, made some tiles more generic and clean up