Cleaned up borders, made some changes