pushed some changes and stuff