fixed bugs so Sal can take over