Skinned a bit, made some bug fixes