Star positioning needs work, fix star cleanup