minor revamp, added fixtures, reworks some entities