fixed some parts that were broken