late night commits... hopefully i didnt break nothing :)