various changes i didnt commit properly