Minor changes && random fixes